From 4eb55a687d2f45701ffe511eaa72756903d749f6 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Fri, 7 Oct 2016 23:09:29 +0100 Subject: [PATCH] Distribute test scripts even if we wouldn't run them This fixes a "make dist" tarball produced on a minimal system and run on a non-minimal system. Automake knows that files that are only conditionally included in dist_whatever_WHATEVER are to be distributed, but it does not do the same for files that are only conditionally included in EXTRA_DIST, which is how glib-tap.mk's various variables like dist_test_scripts work. Signed-off-by: Simon McVittie Closes: #557 Approved by: cgwalters --- Makefile-tests.am | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile-tests.am b/Makefile-tests.am index 7d3f4011..3cfb1e02 100644 --- a/Makefile-tests.am +++ b/Makefile-tests.am @@ -94,11 +94,16 @@ dist_test_scripts = \ if BUILDOPT_FUSE dist_test_scripts += tests/test-rofiles-fuse.sh +else +EXTRA_DIST += tests/test-rofiles-fuse.sh endif # This one uses corrupt-repo-ref.js +js_tests = tests/test-corruption.sh if BUILDOPT_GJS dist_test_scripts += tests/test-corruption.sh +else +EXTRA_DIST += $(js_tests) endif dist_installed_test_data = tests/archive-test.sh \ @@ -133,11 +138,16 @@ dist_gpgvinsttest_DATA = $(addprefix tests/gpg-verify-data/, \ gpg.conf lgpl2 lgpl2.sig pubring.gpg secring.gpg trustdb.gpg) endif -if BUILDOPT_GJS -dist_installed_test_scripts = tests/test-core.js \ +js_installed_tests = \ + tests/test-core.js \ tests/test-sizes.js \ tests/test-sysroot.js \ $(NULL) + +if BUILDOPT_GJS +dist_installed_test_scripts = $(js_installed_tests) +else +EXTRA_DIST += $(js_installed_tests) endif test_ltlibraries = libreaddir-rand.la -- 2.30.2